minor changes in application context