Updates as per review