modifications as per review