Added and changed some methods