improved restart handling?