remove need for store_values_directly