minor changes
merging