Changed return array's structure.  Uncommented new code.  Recommented old code.