changes for 101r verfication and fixing bad waw elements