DONE - Massive speed improvement on test 17