Recommitting Cuong's version