patients first version
merged