add wave 2
reorganise
normalise w2 wfl
organise