Move all auto saving into real auto save