Still some mistakes that could be fixed, but I think a different route would be necessary to see major time improvements.