Moved some bits around