changes to context activities

these will need some discussion