Further code added to some of the methods