Improved results

Improved performance

//]]>