new and improved tracking