some more changes
merged