1.6.3-dev, perfomance is much improved