diff --git a/foundation/www/docs/assets/img/healthcare/lab_test_3.png b/foundation/www/docs/assets/img/healthcare/lab_test_3.png
new file mode 100644
index 00000000..5b50ac9a
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/lab_test_3.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/lab_test_4.png b/foundation/www/docs/assets/img/healthcare/lab_test_4.png
new file mode 100644
index 00000000..212b3cb1
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/lab_test_4.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_2.png b/foundation/www/docs/assets/img/healthcare/practitioner_2.png
index 58252edd..03923c73 100644
Binary files a/foundation/www/docs/assets/img/healthcare/practitioner_2.png and b/foundation/www/docs/assets/img/healthcare/practitioner_2.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_3.png b/foundation/www/docs/assets/img/healthcare/practitioner_3.png
new file mode 100644
index 00000000..3e6e987a
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_3.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_4.png b/foundation/www/docs/assets/img/healthcare/practitioner_4.png
new file mode 100644
index 00000000..f2cc9c80
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_4.png differ
diff --git a/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md b/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md
index 0f49f8cb..c3989eeb 100755
--- a/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md
+++ b/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md
@@ -6,16 +6,24 @@ ERPNext Healthcare allows you to create multiple practitioners and link to a Use
-To enable access to ERPNext, you may want to attach a User with `Physician` role for the practitioner. Most Patient related documents like the Encounter, Vitals etc. offer only limited access to users with other roles. It's also possible that you can associate a Healthcare Practitioner to an Employee so as to utilize the many features like Leaves, Payroll etc.
+To enable access rights to ERPNext, you may want to attach a User with `Physician` role for the practitioner. Most Patient related documents like the Encounter, Vitals etc. offer only limited access to users with other roles. You should ideally link the User to Employee document for the user to access Human Resources module so as to utilize the many features like Leaves, Payroll etc.
->Note: You should ideally link the User to Employee document for the user to access Human Resources module.
+>Note: Selecting the Employee field will fetch in all relevant fields as configured in the Employee document to help you easily setup the Practitioner
### Availability and Charges
-You can select multiple schedules for each practitioner and optionally a service unit at which the practitioner will be available. Also, you can set the consultation charges which are applicable to the practitioner. If required you can select an Income Account for a Physician to book all Consultation charges into separate accounts.
+You can select multiple schedules for each practitioner and optionally a service unit at which the practitioner will be available.
+You can optionally set an `Appointment Type` for each schedule to ensure that only those types of appointments can be booked for the time slots available as per the schedule. Leaving this field blank will allow appointments of any type. Also, enabling `Always Use Slot Duration as Appointment Duration` will override the default behavior of setting appointment duration to the duration configured in the Appointment Type.
+
+
+
+You can set the consultation charges which are applicable to the practitioner. If required, you can also select an Income Account for a Physician to book all Consultation charges into separate accounts.
+
+
+
### Referring Physicians
-You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Healthcare Practitioner document itself by leaving out the User link.
+You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Healthcare Practitioner document itself by leaving out the Employee and User links.
{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/lab_test.md b/foundation/www/docs/user/manual/en/healthcare/lab_test.md
index 873620ec..54024515 100755
--- a/foundation/www/docs/user/manual/en/healthcare/lab_test.md
+++ b/foundation/www/docs/user/manual/en/healthcare/lab_test.md
@@ -1,9 +1,7 @@
# Lab Test
-ERPNext Healthcare allows you to manage a clinical laboratory efficiently by allowing you to enter Lab Tests and print or email test results, manage samples collected, create Invoice etc. ERPNext Healthcare comes pre-packed with some sample tests, you can reconfigure Lab Test Templates for each Test and its result format or crate new ones. You can do this in
-
-`Healthcare > Setup > Lab Text Templates`
+ERPNext Healthcare allows you to manage a clinical laboratory efficiently by allowing you to enter Lab Tests and print or email test results, manage samples collected, create Invoice etc. ERPNext Healthcare comes pre-packed with some frequently ordered tests, you can reconfigure Lab Test Templates for each Test and its result format or create new ones as explained in [Setting Up Laboratory](/docs/user/manual/en/healthcare/setup/setup_laboratory.html)
Once you have all necessary Lab Test Templates configured, you can start creating Lab Tests by selecting a Test Template every time you create a Test. To create a new Lab Test
@@ -11,11 +9,24 @@ Once you have all necessary Lab Test Templates configured, you can start creatin
-You can record the test results in the Lab Test document as the results gets ready.
+It is also possible to use the `Create Multiple` option to create all the lab tests ordered / billed for a patient.
+
+
+
+You can select the Patient and then the Encounter or Invoice from which you need to pull the tests without having to open the Encounter / Sales Invoice to look up the orders.
+
+
+
+If the Lab Test Template has sample collection enabled, creating Lab Test will automatically create Sample Collection records.
+
+> Note: To create Sample Collection documents for every Lab Test, turn on "Manage Sample Collection" flag in Healthcare Settings *and* select Sample in the Lab Test Template
+
+ERPNext Healthcare also allows creation of Lab Tests automatically when any lab tests are billed (via Sales Invoice). This along with other Laboratory configurations can be setup in [Healthcare Settings](/docs/user/manual/en/healthcare/setup/healthcare_settings.html)
+
+As the results gets ready, you can enter the details of results in the Lab Test document. All presets, Normal Values etc. as configured in the Lab Test Template are made available Lab Test for easy data capture.
-> Note: To create Sample Collection documents for every Lab Test, check "Manage Sample Collection" flag in Healthcare Settings and select Sample in the Lab Test Template
In many Laboratories, approval of Lab Tests is a must before printing and submitting the document. ERPNext Healthcare allows you to create Users with Role "Lab Test Approver" for this. You will also have to enable this in
diff --git a/foundation/www/docs/user/manual/en/healthcare/setup/setup_practice.md b/foundation/www/docs/user/manual/en/healthcare/setup/setup_practice.md
index 82e37985..5eae6238 100755
--- a/foundation/www/docs/user/manual/en/healthcare/setup/setup_practice.md
+++ b/foundation/www/docs/user/manual/en/healthcare/setup/setup_practice.md
@@ -11,6 +11,8 @@ To organize your clinic into departments, you can create multiple Medical Depart
## Appointment Type
You can create masters for various type of Appointments. Appointment Type allows you to predefine the duration of the appointment so that while selecting Appointment Type, the duration gets set in the Appointment automatically. This will allow you to override the duration of appointments set by the Practitioner Schedule and the time slots will adjust to the next available time automatically.
+>Note: To disable this behavior, you can enable `Always Use Slot Duration as Appointment Duration` in the Practitioner master. This is will always set the slot duration configured in the Practitioner Schedule as the Appointment duration.
+
You can also set a color for each Appointment Type which will help you identify the appointments of a particular type in the Calendar view.
`Healthcare > Setup > Appointment Type > New Appointment Type`