Removed the Toast and made the app run faster