v0.6 beta with upgrades