new saving scheme, needs testing!