complete diff21