Implemented JH's changes down to name-class