Removed unnecessary diffs from the initial version