edits suggested by tom foti