Michal's HCAL patch