I just shuffled/moved around existing code without mods... but true, fixing