hack-ish restarts and updates