Edit select new table, edit template

Merge now