little changes
merged