updated comments
merge