working on appCOntext fix