small changes, Patient still needs iterator