further changes to tracking