some updates
merging