Change to make the merge easier