Some tinkering the template