changed some methods around