minor changes
merge