myungjoon's code updates