only include passsenger/unicorn if needed