Adapted to changes.