Saving works. Added some checks.