Refactor - move creation into function
Added diff feature