New constant  max_wickets; some reorganization