Added W7
Added W8