Changes to accomodate the new template maker.