adding in more escaping