Template has been added, improved functionality