More work on tracking.