readded template  what nick deleted ... dont do it again nick
fixing merge