reworked sample structure