additional localize things
fixing merge conflict