HPSA-118 some changes