Move tracking code down