improve guard settings to the new version