make the app more generic