changed the template a bit