Added some more options, untested