Keep a piece in to avoid major rewrite