merged Win7 version