Advanced changes (6/25)

Advanced changes