Improve performances