minor changes and merge
merge