some improvements for the original save