partial hand merge for melissa's pull request