Giant overhaul to simplify items