moved into new template