Done for now, no tests
Changed encoding