Update to address hangjun's review comments