performance improvement and benchmark tests updated