Have changed all the methods