Pulling some more of Angela's changes