updated for herr class