Update with feedback from Jason Frey