Templates updated somewhat