Created new branch to merge changes
Merged code with Piyush's frontend