changed logic of WV