Updated tokamak project