Improving encoding, not yet completed