changed diffs to nullable