Adding the requested changes