Majors changes

Now the application works