Finish up the mods [needs testing]