updated apps, more generic