Adding more non-wrapping cells on piece index