Add changes suggested by Gerd