Minor changes
merged