[upd] performances improvements