moved some methods about