More HP changes