Unsaved tracker: improvements