EECS397 / WaG-updated