More work on cp_tracker