Going back to Mangpo's new version of done().