Saving functionality improvement (still in progress).