Changes to make the project runnable
Final