attempted to undo some mistakes..