Incorporated John's suggestions