Adapted to new DHBW rule