Moved commands to a better place