Shifted changes (2/11)

Shifted changes