Added TODO code for diff