Working on updateValues function