update to new templates