Another update, waiting on some more upgrades