W3 polished according with Pavel's comments. 3_6 is unchanged. see comments

According with Igor's skype comments 3_6 is not chaged