Advanced changes (18/25)

Advanced changes