Rework Location Code