Changed original template  slightly.