Move some tracking code around