Bit more work on Encoder