Working on the decoder