made changes suggested by Mason