conform to changes from dragon