redo

Fixes