Refining defensive bidding
Merge branch 'newmodules' into jeff-donna
Merge