changes to hp
fixed merge conflicts