Improvements again
Fix for the win flag