changes suggested by Lee