Advanced changes (11/25)

Advanced changes