Design overhaul