copy changes to using our libraries
Merge pull request #238 from laurawaldoch/using-our-libraries-changes

copy changes to using our libraries