Test

Fix localize issue and fine tuning