merged heather's edits by hand
added db