Ticket_6: fixed
Ticket_6: fixed 2
Ticket_6: Fixed template