Merge with new changes
Fix spelling