minor changes
Merge changes