Implemented JH's changes down to recordInfo-class