Adjusted the setValues