Feature/decode