w5_c2 refactor
w5_c4 done