changes from Ingo