moving some methods around