many improvment in optimized matching