lots of mods/upgrades to list functions