Added a couple more options