Updated as per comments