moved some methods