changes suggested by Markus