Updated and fixed template