Adding manual yes flag