minor adjustment
merge