changes per Jack's review