Add Hps and Hpr and update files