Added more OP scenarios (still not scripted)