Refactored for mAP testing
Cut running time per user by 4x