added the remainder of the template