Added this template back in for convenience
Minor fixes