Added Dolan's version and means to test it like the other versions