added Bjoern and ErwinJ