Value checking is now part of the function that save the value #17