implemented correct changeTracking