Updated with Template