Made another update to templates