Went through some recent upgrades