made the app working correctly