make changes suggested by G