move some stuffs around