Made more optimizations, almost there!