Fixed new step, tested on dummy data.
Faster use of the index.