Change some methods