small changes
merging