big changes, need to fix params_values for single