checking in daniel's suggested changes