Editted both templates