made some changes
merged