If it were me, I’d be sure I had 30 calendar days *AND* 22 work days, not counting holidays. Just for insurance.
Yes!! That would be better.