tightened up winguard condition