customise requests from Jake and Salavat as I understand them

hcal upgrade (2019) customise requests from Jake and Salavat as I understand them