'Fixed' the model tracking code