added changes suggested by Bernhard