#768: Incorporated Shantanu's edits