merge Quang and David