Better folding saving and loading