More work getting the double-encoding to work