commintg changes as per feedback