changes due comment from PR