More work on joint tracking.