agoodm's suggested changes have been accepted