Adding Decoder
Removing things aded by mistake