Advanced changes (4/25)

Advanced changes