major change - adding piece.id