WSW added
Fix merge