back to diff, removed if 0