back to feature parity with old version