change tracking to use separate u and v fields