Move the new code to a more logical location