Added guard automation