Changed Done section to run revamped CommandDone class
Revamped CommandDone