Updated as per review notes