Adapted to external changes