Improved piece selection
Improved piece selection