Changes to include Adam's templates.