Last optimizations... this should work.