Updated to use TDA cloud