no, last changes did not result in perf improvements :>