merge with aim: In order to support localization