addressed comments by Dirk Staehle