Fix Piece generator when splitted and add more patterns