Some more optimization...