Changed the template a little