Shifted some functions around