add more checks for the apps