updated for windows7