refactor with p'nong '21' friday
refactor with p'nong '21'friday