Major rework, improved tracking