Redo

Start from scratch