added diff and changes