Edit from vidyaBranch