more optimization...