Just further optimization...