Way more options and cleaned up