Merge the changes we made during testing the rachel script.