Advanced changes (10/25)

Advanced changes