Modified template to do some more testing