Changed some tntori stuff