From diff