This is now done _after_ the mode has been run. Shouldn't it be _before?_