#57 Changed the interface to accomodate units.