Changed some methods