Merge pull request #1 from monicaedavidson/branch1

Branch1
updated functions