minor changes
merging changes