Updated as per review