moved some bits around