Updated with alternate encodings