HP enhancements