Changed and fixed a better load/save
-