changes per discussion with G