Clean but needs upgrades