Just move some code