Added multi-point localization