made changes as per review comments