Shifted some variables around