moved a couple of components