Modify code to UNICODE Base