Advanced changes (12/25)

Advanced changes