moved some meathods about