added my name and comment
merge conflict with erica resolved