Advanced changes (23/25)

Advanced changes