Changed the structure