now with change tracking