- Oops, shouldn't have removed those encoding funtions. Put them back in...

....