overhauled with upgrades + new resources