More options and slightly cleaner inteface