Finalising the project should be working now completly