Improvements to first person matching