Trying kevin's suggested changes.