changed the structure