Modernized things --- Tests passed
converting to new interfaces