That's a good idea. Following bonus windows is frustrating these days, so I'd be very interested.