lots of edits 3/5/14