adapted to new exactor