Adapted to use sjoh 2.0.0