Modified template slightly