added some mods from earlier