WIP: testing on more data