re-commit, i used unicode instead of utf-8 for encoding