a few changes
merging