Redo Everything to avoid any problems