try to improve performances