Updated challenge 3 w/template