new cleaned up diff