#37 #56 Diff improvements