Advanced changes (13/25)

Advanced changes