Some updates
Merge