Fixed timing, added full restart.