Formatting and upgrades