New: Upgraded everything