Updated and fixed escaping