Added better todo pipe