merge Sarah's changes into sc3's master branch