Advanced change (6/25)

Advanced change