Added leaf-on, leaf-off options