add includes and joins to make the app faster