Typer modifications
Updated header