adjusted the structure