test
added some torus stuff
fixed conflict