Some more optimization