REFACTORED Piece into package