some upgrades ^-^