Significantly improved tracking system