More optimization..