moved some methods down