Changed up the listmode stuff