Rebuilt to take advatange of some template changes.