-- HR-130 Code improvement