Made wide and sweeping changes