Update as per review