Unification with Team C's UI