Updated with new templates