multi updates from Thinh