integrate the new templates