Merged old commit (now) with new save code