Ayush1325 refactor: Updated Version.