update tracking code
switch back to traditional tracking as asynchronous tracking did not work