Optimize some more.