Advanced changes (3/25)

Advanced changes