minor changes to Sarah's fork