Did some more testing against pedro's implementation.