working on Loc of _ changes