Adapted to changed term