Updated as feedback from Sharad