Shifted some procedures around.