redo
fixes