some changes
merged