Updating templates because in a near future I will need it