Comments from wong yu liang (@yuliang11)