Worked on line diff handling