Switched to new indexed interface.  Much, much faster