Updated Templates to match Recent Updates