update for latest refactoring of Raekke