changed some methods