UnderDone suggestions

-snip-