Changed the Structure