changes from H.G. Muller