Advanced changes (7/25)

Advanced changes