Moved some methods around