Added a couple of options