Added optimization.
Perfect match