[UPdate] Make Change as per Feedback