Refactor to find the modifications