Further performance improvements - all in all we got it 3 times faster.