changed the Structure