Including the whole change in one commit