Advanced changes (15/25)

Advanced changes