modified setupPieces method
Merge branch 'unpack'