Several changes on the application