adapted to past changes