some changes
info added
merged