-- HR-212 modification to resolve notices