Move things to make it run properly