Yash cleaning up the tail