rework app context