yet more optimization