Made Pieces work better