System restart stuff modified