Move the code around