ticket: 1 Modified template