Rewrite initial decoder a bit