still trying to fix escaping issues