HPSA-40 add validations, HPSA-105
remove comment by testing