Lionel submitted version -17 (with updated security section)