updated context view #371