move end timer command to the correct location