ContextRework: FIXING REGRESSION