Update Todo
Change implements parsing + increase buffer