major team rewrite