some minor changes
some minor changes
merge