a few modifications after talking to John Jolly this morning