Used the old approach- all tests pass.