Upload improved, encode/decode