Change some of the methods