Better coverage.
Also got rid of one of the overloads since it was kind of pointless.