move some methods around