Added a little more options!