Added code to change values, need to debug it