Added restart
Revert "Added restart"

This reverts commit fcba3621a601597184d3ad9b8e64c9061e7544d4.
Revert "Revert "Added restart""

This reverts commit 2befd8b3bed195dcd792bdcfaaeb35f303aba7b7.
Yaron is going to kill me