Removed some commented rows to make the app run