added auto save before make and next