Added clear_values...