refactored complete for win/block a little more