Moved logic around
4.2.0