Some improvement in win7