Advanced changes (17/25)

Advanced changes