Kang-Refactor/Chatupan.w