Merge Minh's changes