Better restarting
Better restarting-not making another API call