Minor changes
Merge changes