Advanced changes (25/25)

Advanced changes