Redo some stuff.