Major upgrades, updated structure