Changes requested in review