DJR:Added torud and cylinder