HPSA-12 some changes