Added How-Fei's code + fixed print