More work on SOS tracking.