clean up
keep working on hybrid mods