improve first save