Fix the diff_main method
Add all the diff_ methods