More patients
Merge conflicts resolved