HPR stuff added and updated