update from Tuan and Vinh