Some of the dashes are escaped, some aren’t. Can we consolidate this?