now with some more indexing!