Started to add code for decoder