making changes suggested by benoit