Forgot to fix half the conflicts, reformulation.