Updated as per the comments by Admin