Major box overhaul