some updates
a merge