Updated as per admin comments