Advanced changes (22/25)

Advanced changes