latest tweaks improve perforamnce a bit