merge 2

with wj + jw