Adapted to new Check methods