reordered code
forgot a chg of v0.2
use value_list