Pulled Amanda's changes into the dev branch