hr-200 : upgrade code improvement