Change to UTF8 + fixed critical part