changed names and encoding style