Some more updates
merging