V0.23.1, performance improvements