WIP Refactoring get_diff method