[ENH] Further SUPG updates