made Jay's suggested changes