DOC: Incorporated EJs feedback.
DOC: Incorporated EJs feedback.