Advanced changes (8/25)

Advanced changes