code adjustment according to minggo