Updated to a more usable interface.