add Guard for some automation