Mahdi initial bring up

and fix Torch.