Advanced change (10/25)

Advanced change