Add an escaping
Remove the customizing of local