Make the changes as suggested