CAFT: separate into new/updated/unchanged