Fixed comments to match new name.
Rebuilding using tuples again.