added comments
merged