add some changes, to make modifications simpler