Z's full overhaul