minor changes2
merging