Re: [PD] Hour-aware patch