changes from Herbert Bernstein