dave - allowing unlimited number of tokens