updated to the newest templates and protocols