added self. to some methods