Advanced changes (21/25)

Advanced changes