Added template modifications - from emmanuelle