Moves logic around