Made gleitz's suggested changes