updated for teamdiff