3rd update with Ji WU feedback