Advanced changes (5/25)

Advanced changes