Feature parity with raevn's version 3.0.0.