commented some methods out