minor changes
merged