more tuning to try and further improve performance with almost zero gains :-(