changes from Henning