Final commit for WSM 2 V 1