adding in Becky's changes