Core localization improvement