Updated tracking code
resolve merge conflict