Fixed up blackout date code (still unsatisfactory)