Minh merged version