Added avoidsave setting