Removed and converted to a template for easier updating