Added saving and fixed storage