CommandReturn is no longer necessary