Updating to conform to the new method