Implementing the remainder of the required changes for the template.