Added some functionality to tao