Change overall structure