Code updated for windows client...