Reworked the working of the project from ground up