Moved some power of 2 stuff in