updates to context processing