changes as per review #2