Improve(?) save method.