Added one_shot option