Move things to make help work