Updated to universal tracking