Added TNL-526, Mark's, Carol's, and Sylvia's edits