Modified typer.c