More work on decoder.