move some parts arounf