updated with link
minor updates
merge conflict fixed