Updated "restart" functionality