Yet more optiomization.