changing the code back to the last commit, but keeping the charset code