couple of changes from the first draft