Redo

Redid the stuff