Changing some templates around.