New index scheme that runs much faster