Shifted changes (9/11)

Shifted changes