small changes
merged