Fixed the saving and the updating.