changed some methods names