Adapt to new options
Test inhibitors