Updates as requested by Joe, Donald, and Phuong