Advanced changes (16/25)

Advanced changes