Redo

Redone everything