some mods and deletions