well... thats it... optimized MDS and APF, still a bit slower