Still trying to get restart to work properly.