Change option cap to be barrier-specific