improved nonreg indexing