introduced limit switch and rudimentary options hash