merging in more changes from Rebecca.