moved some methods out for now