hpp handling added