Adjusted the structure