Changes after review.

Actually take a result parameter in function that claim to.