adding some tracking