Implemented JH's changes down to titleInfo-class