Changed the structure.