Updated!

Ported changes made on HP