HW7 Updated with new template