Updated to match original interface.