Added a few more options to this script