Jason and Anh's updates