Need to check updation of values logic