removed consistency flag and fixed problem with hard-coded token num
?