using trackDirty now