updated references to context