some mods
 Changes in the structure