A few mods later...