Improve performances again.